Weird, I wonder why the first two commits show up again even though they've already been merged into master in #649? Maybe it's because I re-used the same branch?

Hmm. After resolving the changelog merge conflict the diff part from the first two commits disappeared. At least that's sane.

yeah i think its because the squash resulted in a new commit, which means you're adding "new" commits to the history.

In this case its harmless because I'm going to squash this pr too :)

Ah, squash-n-merges, that makes sense.